From c01138a1c1731c1fddea28db678002c0339980d7 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Mon, 30 Aug 2004 18:18:31 +0000 Subject: [PATCH] [ Merge from Emacs trunk: ] 2004-08-30 Juanma Barranquero * ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant. [Emacs/trunk 2003-02-18] 2004-08-30 Andreas Schwab * nnlistserv.el (nnlistserv-kk-wash-article): Fix paren nesting. * gnus-score.el (gnus-summary-increase-score): Fix format string. [Emacs/trunk 2004-02-08] 2004-08-30 Stefan Monnier * nnimap.el (nnimap-demule): Avoid string-as-multibyte. [Emacs/trunk 2004-05-06] 2004-08-30 Kim F. Storm * nntp.el (nntp-authinfo-file): Add :group 'nntp. * nnimap.el (nnimap-authinfo-file, nnimap-prune-cache): Add :group 'nnimap. [Emacs/trunk 2004-06-29] --- lisp/gnus/ChangeLog | 29 +++++++++++++++++++++++++++++ lisp/gnus/gnus-score.el | 4 ++-- lisp/gnus/ietf-drums.el | 2 +- lisp/gnus/nnimap.el | 17 +++++++++++------ lisp/gnus/nnlistserv.el | 4 ++-- 5 files changed, 45 insertions(+), 11 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 565eb9bf293..e236c4b7c97 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,32 @@ +2004-08-30 Juanma Barranquero + + * ietf-drums.el (ietf-drums-remove-whitespace): Fix character constant. + + [Emacs/trunk 2003-02-18] + +2004-08-30 Andreas Schwab + + * nnlistserv.el (nnlistserv-kk-wash-article): Fix paren nesting. + + * gnus-score.el (gnus-summary-increase-score): Fix format string. + + [Emacs/trunk 2004-02-08] + +2004-08-30 Stefan Monnier + + * nnimap.el (nnimap-demule): Avoid string-as-multibyte. + + [Emacs/trunk 2004-05-06] + +2004-08-30 Kim F. Storm + + * nntp.el (nntp-authinfo-file): Add :group 'nntp. + + * nnimap.el (nnimap-authinfo-file, nnimap-prune-cache): + Add :group 'nnimap. + + [Emacs/trunk 2004-06-29] + 2004-08-23 Reiner Steib * mm-decode.el (mime-display, mime-security): Fix custom-manual diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el index ae85ca76ec1..a78e5087dcb 100644 --- a/lisp/gnus/gnus-score.el +++ b/lisp/gnus/gnus-score.el @@ -1,5 +1,5 @@ ;;; gnus-score.el --- scoring code for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 ;; Free Software Foundation, Inc. ;; Author: Per Abrahamsen @@ -627,7 +627,7 @@ file for the command instead of the current score file." (gnus-score-insert-help "Match permanence" char-to-perm 2))) (gnus-score-kill-help-buffer) - (if mimic (message "%c %c %c" prefix hchar tchar pchar) + (if mimic (message "%c %c %c %c" prefix hchar tchar pchar) (message "")) (unless (setq temporary (cadr (assq pchar char-to-perm))) ;; Deal with der(r)ided superannuated paradigms. diff --git a/lisp/gnus/ietf-drums.el b/lisp/gnus/ietf-drums.el index 1ac2040b2e2..d4137bae321 100644 --- a/lisp/gnus/ietf-drums.el +++ b/lisp/gnus/ietf-drums.el @@ -133,7 +133,7 @@ backslash and doublequote.") (forward-sexp 1)) ((eq c ?\() (forward-sexp 1)) - ((memq c '(? ?\t ?\n)) + ((memq c '(?\ ?\t ?\n)) (delete-char 1)) (t (forward-char 1)))) diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 872277102db..fc33b9a48eb 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1,5 +1,5 @@ ;;; nnimap.el --- imap backend for Gnus -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ;; Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -391,11 +391,13 @@ just like \"ticked\" articles, in other IMAP clients.") (string :format "Login: %v")) (cons :format "%v" (const :format "" "password") - (string :format "Password: %v"))))))) + (string :format "Password: %v")))))) + :group 'nnimap) (defcustom nnimap-prune-cache t "If non-nil, nnimap check whether articles still exist on server before using data stored in NOV cache." - :type 'boolean) + :type 'boolean + :group 'nnimap) (defvar nnimap-request-list-method 'imap-mailbox-list "Method to use to request a list of all folders from the server. @@ -802,9 +804,12 @@ function is generally only called when Gnus is shutting down." (nnoo-status-message 'nnimap server))) (defun nnimap-demule (string) - (funcall (if (and (fboundp 'string-as-multibyte) - (subrp (symbol-function 'string-as-multibyte))) - 'string-as-multibyte + ;; BEWARE: we used to use string-as-multibyte here which is braindead + ;; because it will turn accidental emacs-mule-valid byte sequences + ;; into multibyte chars. --Stef + (funcall (if (and (fboundp 'string-to-multibyte) + (subrp (symbol-function 'string-to-multibyte))) + 'string-to-multibyte 'identity) (or string ""))) diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el index 87dcb068a69..770bb02d01e 100644 --- a/lisp/gnus/nnlistserv.el +++ b/lisp/gnus/nnlistserv.el @@ -1,6 +1,6 @@ ;;; nnlistserv.el --- retrieving articles via web mailing list archives -;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2004 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news, mail @@ -122,7 +122,7 @@ (mm-url-decode-entities) (while headers (goto-char (point-min)) - (re-search-forward (format "